Merge from emacs-24; up to r111146
authorGlenn Morris <rgm@gnu.org>
Sun, 6 Jan 2013 20:34:54 +0000 (12:34 -0800)
committerGlenn Morris <rgm@gnu.org>
Sun, 6 Jan 2013 20:34:54 +0000 (12:34 -0800)
commit43350a2a061887ce24a17387f75d1248afaddd6d
tree7adfa4ee43cd091b4858bcd7077e5663d37895c5
parenta1f80a4783d455e291fa41d67a9fb7aca13b05db
parent0a7ccdbab795b116dcda755dc7dd33c5252abc22
Merge from emacs-24; up to r111146
doc/lispref/ChangeLog
doc/lispref/windows.texi
doc/misc/ChangeLog